broadway: Drop unused argument from query_state
authorMatthias Clasen <mclasen@redhat.com>
Wed, 26 Aug 2020 20:28:09 +0000 (16:28 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 26 Aug 2020 21:56:41 +0000 (17:56 -0400)
Now that this is backend-only api, we can just
drop unused arguments.

gdk/broadway/gdkdevice-broadway.c
gdk/broadway/gdkdevice-broadway.h
gdk/broadway/gdksurface-broadway.c

index cbcf5d6e79e06b00441d07efab4c90fcd6b1c809..1a815c278c1ee99af1fd4e50b83d385326abe0df 100644 (file)
@@ -75,7 +75,6 @@ gdk_broadway_device_set_surface_cursor (GdkDevice *device,
 void
 gdk_broadway_device_query_state (GdkDevice         *device,
                                  GdkSurface        *surface,
-                                 GdkSurface       **child_surface,
                                  double            *win_x,
                                  double            *win_y,
                                  GdkModifierType   *mask)
@@ -104,18 +103,6 @@ gdk_broadway_device_query_state (GdkDevice         *device,
     *win_y = device_root_y;
   if (mask)
     *mask = mask32;
-  if (child_surface)
-    {
-      GdkSurface *mouse_toplevel;
-
-      mouse_toplevel = g_hash_table_lookup (broadway_display->id_ht, GUINT_TO_POINTER (mouse_toplevel_id));
-      if (surface == NULL)
-        *child_surface = mouse_toplevel;
-      else
-        *child_surface = NULL;
-    }
-
-  return;
 }
 
 void
@@ -248,7 +235,7 @@ gdk_broadway_device_surface_at_position (GdkDevice       *device,
 {
   GdkSurface *surface = NULL;
 
-  gdk_broadway_device_query_state (device, NULL, &surface, win_x, win_y, mask);
+  gdk_broadway_device_query_state (device, NULL, win_x, win_y, mask);
 
   return surface;
 }
index 33b715924f5e5eb56e2d6e84e0f2862d3848fbf2..cde76b4c6e5e987e14eb05bd2ccad2a4a1dc6a4d 100644 (file)
@@ -47,7 +47,6 @@ GType gdk_broadway_device_get_type (void) G_GNUC_CONST;
 
 void gdk_broadway_device_query_state (GdkDevice        *device,
                                       GdkSurface       *surface,
-                                      GdkSurface      **child_surface,
                                       double           *win_x,
                                       double           *win_y,
                                       GdkModifierType  *mask);
index bb932ee17fc2c80ebe9a46d1fe1fa33723d4e09c..f0f152203feaf2b9cf3058a6558908408e11c1b6 100644 (file)
@@ -755,7 +755,7 @@ gdk_broadway_surface_get_device_state (GdkSurface      *surface,
   if (GDK_SURFACE_DESTROYED (surface))
     return FALSE;
 
-  gdk_broadway_device_query_state (device, surface, NULL, x, y, mask);
+  gdk_broadway_device_query_state (device, surface, x, y, mask);
 
   return *x >= 0 && *y >= 0 && *x < surface->width && *y < surface->height;
 }